DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I004dfd973f0d88ed308eb50955be071ba94442e1